bitkeeper revision 1.1159.212.75 (4201e86fqC-UkeTMjRJgsysdz4rT7w)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 3 Feb 2005 09:01:35 +0000 (09:01 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 3 Feb 2005 09:01:35 +0000 (09:01 +0000)
commitde60e480e06771e5a9f6da076b2008c20ee17094
tree6b1b53f4c65a28186fe2019aba2d0efd7283cdc0
parentaada4119d1ea8256593e1d618770d4aa320b0aaf
parent557f25a0fa50db5f8d5ec81757634cf7005284b3
bitkeeper revision 1.1159.212.75 (4201e86fqC-UkeTMjRJgsysdz4rT7w)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c
xen/Makefile
xen/drivers/char/console.c